From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 3 Jul 2012 21:48:57 +0000 (+0200)
Subject: calendar-server: Add .desktop file for evolution calendar
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6383
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=20769f68a7b2fe4c43fcdfcce070d42f7ce5443c;p=gnome-shell.git

calendar-server: Add .desktop file for evolution calendar

When selecting "Open Calendar" in the date menu, the configured
application is launched via command line, so we don't get any
startup notification. In order to fix the issue at least for our
default calendar, add a hidden .desktop file for evolution's
calendar component.

https://bugzilla.gnome.org/show_bug.cgi?id=677907
---

diff --git a/.gitignore b/.gitignore
index b75e3b91d..1d9aeffc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,8 @@ src/*-enum-types.[ch]
 src/*-marshal.[ch]
 src/Makefile
 src/Makefile.in
+src/calendar-server/evolution-calendar.desktop
+src/calendar-server/evolution-calendar.desktop.in
 src/calendar-server/org.gnome.Shell.CalendarServer.service
 src/gnome-shell
 src/gnome-shell-calendar-server
diff --git a/configure.ac b/configure.ac
index d5875f9d9..7ab5976b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,7 @@ AC_CONFIG_FILES([
   docs/reference/st/Makefile
   docs/reference/st/st-docs.sgml
   js/Makefile
+  src/calendar-server/evolution-calendar.desktop.in
   src/Makefile
   browser-plugin/Makefile
   tests/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5f68020ac..25b8e31f3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,6 +41,7 @@ js/ui/userMenu.js
 js/ui/viewSelector.js
 js/ui/wanda.js
 js/ui/windowAttentionHandler.js
+src/calendar-server/evolution-calendar.desktop.in.in
 src/gvc/gvc-mixer-control.c
 src/main.c
 src/shell-app.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index fe31eda49..1677f82b5 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,4 @@
 data/gnome-shell.desktop.in
 data/gnome-shell-extension-prefs.desktop.in
 data/org.gnome.shell.evolution.calendar.gschema.xml.in
+src/calendar-server/evolution-calendar.desktop.in
diff --git a/src/Makefile-calendar-server.am b/src/Makefile-calendar-server.am
index cf45b642c..bad727e67 100644
--- a/src/Makefile-calendar-server.am
+++ b/src/Makefile-calendar-server.am
@@ -8,6 +8,12 @@ gnome_shell_calendar_server_SOURCES =								\
 	calendar-server/gnome-shell-calendar-server.c						\
 	$(NULL)
 
+desktopdir=$(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_in_files = calendar-server/evolution-calendar.desktop.in
+
+@INTLTOOL_DESKTOP_RULE@
+
 gnome_shell_calendar_server_CFLAGS =		\
 	-I$(top_srcdir)/src			\
 	-DPREFIX=\""$(prefix)"\"		\
@@ -26,3 +32,6 @@ EXTRA_DIST += 							  \
 	calendar-server/README					  \
 	calendar-server/org.gnome.Shell.CalendarServer.service.in \
 	$(NULL)
+
+CLEANFILES = \
+	$(desktop_DATA)
diff --git a/src/calendar-server/evolution-calendar.desktop.in.in b/src/calendar-server/evolution-calendar.desktop.in.in
new file mode 100644
index 000000000..4ce0bda0a
--- /dev/null
+++ b/src/calendar-server/evolution-calendar.desktop.in.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Evolution Calendar
+Exec=evolution -c calendar
+Icon=evolution
+NoDisplay=true
+Type=Application
+StartupNotify=true